Auto merge of #2028 - aarzee:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 6 Oct 2015 15:43:24 +0000 (15:43 +0000)
committerbors <bors@rust-lang.org>
Tue, 6 Oct 2015 15:43:24 +0000 (15:43 +0000)

Trivial merge